[5.3] Improve the "with default" option in the has one relation. #16382
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamCampbell
changed the title
| return call_user_func($this->withDefault); | ||
| $result = call_user_func($this->withDefault); | ||
| } elseif (is_array($this->withDefault)) { | ||
| $result = $this->related->newInstance($this->withDefault); |
There was a problem hiding this comment.
You would probably want to forceFill these.
There was a problem hiding this comment.
@taylorotwell done.
sileence
force-pushed
the
hasOneWithDefault/improveClosure
branch
from
e56b33a to
99d7169
Compare
| if (is_callable($this->withDefault)) { | ||
| return call_user_func($this->withDefault); | ||
| $result = call_user_func($this->withDefault); |
There was a problem hiding this comment.
- Why would the callback want to return
null? That's a little weird. - Wouldn't it be better to pass a new linked-up model to the callback?
Maybe something like this:
protected function getDefaultFor(Model $model)
{
if (! $this->withDefault) {
return;
}
$instance = $this->related->newInstance()->setAttribute(
$this->getPlainForeignKey(), $model->getAttribute($this->localKey)
);
if (is_callable($this->withDefault)) {
return call_user_func($this->withDefault, $instance);
}
if (is_array($this->withDefault)) {
$instance->forceFill($this->withDefault);
}
return $instance;
}There was a problem hiding this comment.
- I don't know, I just wanted to leave that possibility.
- I really like how you refactored the code 👍
There was a problem hiding this comment.
So are you going to refactor the code to Joseph's suggestion?
There was a problem hiding this comment.
@taylorotwell done. If nothing is returned from the closure, the default instance will be returned automatically.
Thank you @JosephSilber! The code looks better now.
sileence
force-pushed
the
hasOneWithDefault/improveClosure
branch
2 times, most recently
from
6149832 to
e98e75c
Compare
sileence
force-pushed
the
hasOneWithDefault/improveClosure
branch
from
e98e75c to
d7bfc91
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are 3 commits here:
First add test for the closure option.
Add option to pass an array of attributes for the default model, i.e.:
null.